Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use tokio-rustls 0.23 #396

Merged
merged 6 commits into from
Oct 19, 2021
Merged

Use tokio-rustls 0.23 #396

merged 6 commits into from
Oct 19, 2021

Conversation

edward-shen
Copy link
Contributor

@edward-shen edward-shen commented Oct 18, 2021 •
edited
Loading

PR Type

Feature

PR Checklist

Check your PR fulfills the following:

  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • A changelog entry has been made for the appropriate packages.
  • Format code with the latest stable rustfmt

Overview

This is related to actix/actix-web#2304, which requires acitx-tls to support rustls 0.20. tokio-tls 0.23 adds this support, so we just need to version bump everything, and address locations that are broken.

Note that a breaking change exists, as we no longer re-export Session.

Tests were made with cargo t --all-features, and verification of the change was performed with cargo tree -p actix-tls --all-features | grep rustls:

├── tokio-rustls v0.23.0
│   ├── rustls v0.20.0
├── rustls-pemfile v0.2.1

@edward-shen edward-shen mentioned this pull request Oct 18, 2021
Closed
5 tasks
robjtede
robjtede approved these changes Oct 18, 2021
View reviewed changes
actix-tls/CHANGES.md Outdated Show resolved Hide resolved
actix-tls/examples/tcp-rustls.rs Outdated Show resolved Hide resolved
@edward-shen
Copy link
Contributor Author

Re: CI failures: rustls uses bool::then which were stabilized in 1.50 (rust-lang/rust#79299). Not sure if we can bump actix-net's MSRV to 1.50? (rustls real MSRV is 1.52.1 so optimally we'd bump to that instead).

@robjtede
Copy link
Member

robjtede commented Oct 18, 2021 •
edited
Loading

1.52 is higher than i want to go :/ the higher level parts of actix have moved to 1.51 recently

i'll look into it today

@robjtede
Copy link
Member

Managed to get the CI working. Raised MSRV for -server and -tls to 1.52 so this can go ahead.

@robjtede robjtede merged commit 669e868 into actix:master Oct 19, 2021
@robjtede
Copy link
Member

released in actix-tls v3.0.0-beta.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robjtede robjtede robjtede approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@edward-shen @robjtede